Clean up methods
Version 1.12