Removing attempt and some minor issue fix