remove refs to page/home panels
remove refs to attributes hash
add additional models