Removed commits that should have been on dev branch