General cleanup, config moved to application