Removed defauly values

This can be delt with later