Cleanup / remove a few lines

Just removing duplicate logic