Yay for deletion of unnecessary code :D