Removed warnings/unused variables