Stripped some comments