Removes shit
Removed
Merge branch 'old'