Entity / Model cleanup