get rid of old implementations, comments, etc