Code cleanup. Removed commented-out code and redundant variables.