Removed some broken code and fixed a typo