Removed rest of legacy. Commenting