Revert "major cleanup"

This reverts commit e960722c7b989badcccc801592dd56cf9ab07543.
cleanup properdone