Documentation and Entity Clean Up