Cleaning unnecessary imports and implemented updated facilities module