Removing some shit code
Removing spurious variables