Removed some non working crap