Deleted code that shouldt have been there.
Merge branch 'dev-feature' into dev-master