Remove more deprecated functionality, general cleanup