Code cleanup. Removed commented code and the declaration of an unused block