remove a lot of un-needed scaffold code