Removed mains, useless comments