App wide cleanup, 1
App wide cleanup, 1