Cleanup and removing border graphics