drupal functions cleanup. removed 2 unused functions. misc. cleanup.

Signed-off-by: William Rockwood <wrockwood@tadl.org>
Merge branch 'master' of github.com:tadl/responsive-web