Cleaned up some unnecessary code