Got rid of some extra stuff