Removed unneccessary code. Should fix #69