Removed unnecessary duplication from method extraction. Build clean up.