branch/remove-border

@eric79 Please review.