Removed non-functional code