Cleaned up some messy and unused stuff