Indianna Level 2 : Removing Trajectory class