Clean up for FindBugs
Mark new methods as @Transient