Drop PersistenceCapable usage