Removed some old, commented code