removing some extra stuff