Redundancy cleanup (revert with the last commit)