Cleaned up from config removal