Removed unecessary boilerplate