Eliminated not needed stuff