Removed horribly useless boilerplate code
Revert a97ba9b