Tidy up, removed extra configuration