ACTUALLY removed all unneeded code