Cleanup, comment, remove unused function