remove testing methods, get rid of warnings