Cleaned up entity actions