cleaned up useless code