Removed more old files that will be replaced by new updated framework