Code cleanup

Cleaned up some unnecessary code pieces