more clean up and massive profiling in progress