Remove boiler plate