removed debugging code and lint issues