Reverted cleanup