cleanup unused comments and init