#1494

All these methods should be private