Update availability
Cleanup unused file