remove border, clean up js