Cleaning up more code, system generated by config