Removed debug infomation and old code