Removed comments and unused function