Had some variables not needed. Removed.