update | removed un-needed stuff