removed buggy parts