Clean up Javascript & JS includes