Amended methods

Simplified change, remove