Fix assets and remove waste