These methods are no longer needed
Simplifying logic
Implementing release switch method