Old variables

Removed a bunch of useless variables