Removed errornous code