Removed conflicting code

This should have never been there... that's on another branch O_o