Comments + removed some unused routines