Remove old code
Remove dispensable var