Restructure/removal of unneeded parts