Removed some boiler plate