remove tons of old commented wrapper code