Got rid of original code