Setup work
Removed unused code