Removing the commented out shitty code ;)