Removed some extra stuff