Removed 'default'-comments and cleand a fails-comment