corrected pre/postconditions
deleted unused methods