Remove some things and Prepare for work

This commit should remove some things that we would have to deal with, and makes way for the new development.