clean up building. yet to do rider queue system