Removed unused module, and couple more little things.