Removed unused code
cleanup