Removed some extra stuff.