Removed system.out statements