Remove un-needed functions