Updated removeBorder to use existing function other than do its own thing