lint checking code.. cleanup unused code