Remove unnecessary caps