Initial commit
Clean up redundant conf