removed unwanted behaviours