Removing some old, broken code