removed un-needed function and variables