Remove unneeded boilerplate
working