should we get rid of these completely? instead of commenting them out.