Remove some functions, and fix some annoyances