Cleanup: Removing unused DTO's