removed some code, as a clean up