removed commented out & unnecessary functions