Some more code cleanup / removing files