removing unnecessary classes
adding todo for relay.php