Added version & cleanup