Remove waste stuff

Remove waste stuff