Removed some extra things