Small fixes

two small commits that remove unused/obsolete code