Revert last commit + remove useless properties/ivars