Removed dev statements and all tests passing