cleanup of buildings module