Removed more unnecessaries
Remove