Removed dead Monitor code and fixed minor bug