Cleaned up some extra/old