Remove and/or hide unused code