Removed unused file and cleaned up availability