Fixes and remove things which sholdn't be here