cleaned up a bit by removing some unused functions & variables