Got rid of superfluous stuff!