Config cleaned up