Removed unneeded static context to vars

made code cleaner, removed unneeded code