Code cleanup; Removed ponies