general cleanup / removing unused code