Fixed bad merge
More cleanup