remove unused code and avoid nils
Merge branch 'development' into cleanup_on_aisle_four