Removing debug and clean up