Removing comments and unsused code