fix point and remove unused types