Removed a few changes from the last PR