Removed deprecated stuff, added new from comments