Removed code (merged 2 PR into one by error)