Removed old crappy versions of code ;)