Removing parts that might not fit my requirements