Removed dynamic parts, due to deployment issues