fogot to cleanup comments and debugger statements