Removing old boilerplate and commiting new