Hopefully I can remove everything