Clean up and Start fix for TRDS