Deleted all short codes to start clean
small changes