Remove wrongly attached stuff

Change-Id: I3e729e424fe10fccb13c4f340a28772db883fbe4