Proper Epoch base build add and clean epoch

files only no code changes