Removed some deprecated shit