Building service cleanup