Removed dead code and superfluous comments