ref #1391 -- cleanup of old code
ref #1391 -- cleanup of old code

gchtr/timber,timber/timber,timber/timber,josephbergdoll/timber,gchtr/timber,jarednova/timber,jarednova/timber,gchtr/timber,jarednova/timber,josephbergdoll/timber,josephbergdoll/timber