cleanup dead code and use container interface instead of fragment class
model cleaned up