Cleaned up code, removed outdated TODO items