cleanup of useless comments and toy code