removing old hardcoded pieces in anticipation of release