Should removed commented out code throughout.