Remove usage of deprecated APIs

Dont even need space-pen, eh?