remove undefined & unneeded shit