Cleanup imports
Remove out dated todo
remove unnecessary method
Remove unnecessary field from process