Remove more unused code / cleanup