Added cleanup of derived data and minor tweaks
VP TK Removed extra methods