Cleaned up some unnecessary code and removed all 'blocker' issues