Removed commented echos and similar, cleaned object up