cleaning up by removing unsed code