Some more configs and cleanup