Cheap fix for remove availability