Removed duplicate code
Removed todo destructors
Springs