remove devel/debug code, clean up code