cleaning up old leftover code