remove unncessary cfm, remove js add override func in favor of framework add, changing to cflayout includes, removing unncessary variable passing