Cleaned up some unnecessary stuff