Remove deprecated stuff

Found some stuff marked as deprecated, so I removed it and its traces.
Seems to work fine and I hope I didn't miss anything. :)