Removing experimental part, making it simpler